From d5da15306fbff357726d6c8ba0925a7aca1bbb31 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 24 Jun 2010 12:45:32 +0100 Subject: [PATCH] ocaml: remove bogus /dev/xen/ev[en]tchn Oxenstored should not try to create the evtchn device, as it: * creates the wrong name (/dev/xen/eventchn rather than evtchn) * uses a hard-coded minor number, even though this dynamically depends on what other misc devices are in the kernel Remove all this code and just rely on the system to create the device. Signed-off-by: Jeremy Fitzhardinge --- tools/ocaml/libs/eventchn/eventchn_stubs.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/ocaml/libs/eventchn/eventchn_stubs.c b/tools/ocaml/libs/eventchn/eventchn_stubs.c index 210aa30afa..e5d1591188 100644 --- a/tools/ocaml/libs/eventchn/eventchn_stubs.c +++ b/tools/ocaml/libs/eventchn/eventchn_stubs.c @@ -34,10 +34,7 @@ #include #include -#define EVENTCHN_PATH "/dev/xen/eventchn" - -static int eventchn_major = 10; -static int eventchn_minor = 61; +#define EVENTCHN_PATH "/dev/xen/evtchn" static int do_ioctl(int handle, int cmd, void *arg) { @@ -56,15 +53,7 @@ static int do_write_port(int handle, evtchn_port_t port) int eventchn_do_open(void) { - int fd; - - fd = open(EVENTCHN_PATH, O_RDWR); - if (fd == -1 && errno == ENOENT) { - mkdir("/dev/xen", 0640); - mknod(EVENTCHN_PATH, S_IFCHR | 0640, makedev(eventchn_major, eventchn_minor)); - fd = open(EVENTCHN_PATH, O_RDWR); - } - return fd; + return open(EVENTCHN_PATH, O_RDWR); } CAMLprim value stub_eventchn_init(value unit) -- 2.30.2